auto merge of #295 : alexcrichton/cargo/snapshots, r=alexcrichton,me
authorbors <bors@rust-lang.org>
Wed, 30 Jul 2014 17:58:28 +0000 (17:58 +0000)
committerbors <bors@rust-lang.org>
Wed, 30 Jul 2014 17:58:28 +0000 (17:58 +0000)

Trivial merge